Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Nov 2011 00:04:15 +0000 (16:04 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Nov 2011 00:04:15 +0000 (16:04 -0800)

Trivial merge